(report) Add TX_CURR report by reagan-meant · Pull Request #32 · path-drc/openmrs-module-drcreports

reagan-meant · 2025-08-12T07:48:34Z

No description provided.

reagan-meant · 2025-08-12T09:13:58Z

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCTxCurr.sql

+                      AND e_subsequent.voided = 0
+                      AND et_subsequent.uuid = 'cb0a65a7-0587-477e-89b9-cf2fd144f1d4'
+                      AND DATE(e_subsequent.encounter_datetime) > DATE(o_appt.value_datetime)
+                      AND DATE(e_subsequent.encounter_datetime) <= :onOrBefore


Ensure they received drugs

Add logic that queries patients seen in the reporting period who were given drugs

reagan-meant · 2025-08-12T09:14:27Z

api/src/main/java/org/openmrs/module/drcreports/reports/DRCTx_CurrReportManager.java

+		List<Concept> artInitiationAnswers = new ArrayList<Concept>();
+		artInitiationAnswers.add(cs.getConceptByUuid("1256AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")); // Start ART
+		artInitiationAnswers.add(cs.getConceptByUuid("162904AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")); // Restart ART
+		artInitiation.setValueList(artInitiationAnswers);


Ensure they have drugs given

reagan-meant · 2025-08-12T09:14:34Z

api/src/main/java/org/openmrs/module/drcreports/reports/DRCTx_CurrReportManager.java

+		List<Concept> transferInPMTCTAnswers = new ArrayList<Concept>();
+		transferInPMTCTAnswers.add(cs.getConceptByUuid("160563AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")); // Transfer in
+		transferInPMTCTAnswers.add(cs.getConceptByUuid("163532AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")); // Enroll into PMTCT
+		transferInPMTCT.setValueList(transferInPMTCTAnswers);


Ensure they have drugs given

reagan-meant · 2025-08-13T18:49:49Z

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCTxCurrTransferPMTCT.sql

+           WHERE o_prevention.encounter_id = o.encounter_id
+             AND o_prevention.voided = 0
+             AND c_prevention.uuid = '163532AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' -- ART Prevention being taken
+             AND o_prevention.value_coded IS NOT NULL


This answer should be "Yes"

ibacher

Thanks @reagan-meant! A few questions, but mostly small quibbles about SQL...

ibacher · 2025-08-20T14:04:16Z

api/src/main/java/org/openmrs/module/drcreports/reports/DRCTx_CurrReportManager.java

+import org.openmrs.module.reporting.common.BooleanOperator;
+
+@Component
+public class DRCTx_CurrReportManager extends ActivatedReportManager {


I think we probably just name this DRCTxCurrReportManager?

ibacher · 2025-08-20T14:10:05Z

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCArtLessthanThreeMonthsDispense.sql

+      AND o.value_numeric IS NOT NULL
+      AND o.value_numeric < 90


Technically o.value_numeric < 90 will also eliminate rows where value_numeric is null

SQL uses a 3-value logic where things are TRUE, FALSE and NULL that uses something like these truth tables:

Value NOT Value

True False

False True

Null Null

Value AND True AND False AND Null

True True False Null

False False False Null

Null Null Null Null

Value OR True OR False OR Null

True True True Null

False True False Null

Null Null Null Null

Basically, any operation that involves a NULL results in a NULL, and NULL is not true, so the row isn't matched.

ibacher · 2025-08-20T14:38:55Z

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCArtSixAndAboveMonthsDispense.sql

+      AND o.value_numeric IS NOT NULL
+      AND o.value_numeric > 180


Shouldn't this be >=?

ibacher · 2025-08-20T14:41:20Z

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCTxCurrInitiation.sql

+      AND DATE(o.obs_datetime) >= :onOrAfter
+      AND DATE(o.obs_datetime) <= :onOrBefore


Suggested change

AND DATE(o.obs_datetime) >= :onOrAfter

AND DATE(o.obs_datetime) <= :onOrBefore

AND DATE(o.obs_datetime) BETWEEN :onOrAfter AND :onOrBefore

ibacher · 2025-08-20T14:46:41Z

api/src/main/java/org/openmrs/module/drcreports/reports/DRCTx_CurrReportManager.java

+		// Not stopped ART in date range
+		SqlCohortDefinition notStoppedARTSqlCD = new SqlCohortDefinition();
+		String notStoppedARTSql = getStringFromResource("org/openmrs/module/drcreports/sql/DRCTxCurrNotStopedART.sql");
+		notStoppedARTSqlCD.setQuery(notStoppedARTSql);
+		notStoppedARTSqlCD.addParameter(new Parameter("onOrAfter", "On Or After", Date.class));
+		notStoppedARTSqlCD.addParameter(new Parameter("onOrBefore", "On Or Before", Date.class));


Does this account for the case where in one quarter, a person initiates ART, discontinues ART and then recontinues it before the end date?

See Appendix J of the MERS Reference Guide

ibacher · 2025-08-20T14:46:54Z

api/src/main/java/org/openmrs/module/drcreports/reports/DRCTx_CurrReportManager.java

+		notTransferredOutSqlCD.addParameter(new Parameter("onOrAfter", "On Or After", Date.class));
+		notTransferredOutSqlCD.addParameter(new Parameter("onOrBefore", "On Or Before", Date.class));
+
+		// Lessthan 3 months ART Dispensation


Suggested change

// Lessthan 3 months ART Dispensation

// Less than 3 months ART Dispensation

ibacher · 2025-08-20T14:51:02Z

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCTxCurrNotStopedART.sql

DRCTxCurrNotStoppedART.sql 👉 DRCTxCurrNotStoppedART.sql

api/src/main/resources/org/openmrs/module/drcreports/sql/DRCTxCurrTransferPMTCT.sql

ibacher · 2025-08-21T14:47:28Z

Could we add some test cases for this since it's kind of key we get this right. I think the tests should cover:

At least 1 patient for each disaggregation category
The described cases from Appendix J, specifically (I've reworded this so that each scenario is a separate patient history):
- Patient A was newly initiated on treatment. During the reporting period, Patient A did not attend an appointment and had no clinical contact for 28 days after that appointment. Patient A was then contacted and came in for an appointment. At the end of the reporting period, Patient A is on treatment (Patient A shows up on TX_CURR)
- Patients B started the reporting period on treatment, but all did not attend an appointment and had no clinical contact for 28 days afterwards. Patient B was successfully contacted and came in for an appointment. At the end of the quarter, Patient B is on treatment (Patient B shows up on TX_CURR)
- Patients C started the reporting period on treatment, but all did not attend an appointment and had no clinical contact for 28 days afterwards. Patient C was not successfully contacted and did not come in for an appointment. At the end of the quarter, Patient C is not on treatment (Patient C does not show up in TX_CURR)
- Patients D started the reporting period not on treatment. Patient CDwas contacted and came in for an appointment but experienced an interruption in treatment again during the reporting period. By the end of the reporting period, Patients D is not on treatment (Patient D does not show up in TX_CURR)

ibacher · 2025-08-21T14:37:35Z

api/src/main/resources/messages.properties

+${project.parent.artifactId}.report.drc.fifteenYrsAndAboveMales.label=15+ years (Males)
+${project.parent.artifactId}.report.drc.fifteenYrsAndAboveFemales.label=15+ years (Females)
+
+${project.parent.artifactId}.report.drc.threeMonthsDrugsGiven.label=3 months drugs


Could we change the label here to "3 months or less" and similarly in French.

It is actually less than 3 months, fixed.

ibacher · 2025-09-03T12:12:01Z

api/src/test/resources/org/openmrs/module/drcreports/include/DRCTXCURRTestDataset.xml

Two minor things:

Could we name this simlarly to the report manager itself, i.e., DRCTxCurrTestDataset

Why is the dataset split into two?

ibacher · 2025-09-03T17:41:06Z

Hmmm... It seems the test fails now?

reagan-meant added 3 commits August 12, 2025 10:48

(report) Add TX_CURR report

140e55a

Improved the Tx Curr report

170ba23

Add comments

83f810d

reagan-meant commented Aug 13, 2025

View reviewed changes

Add more disaggregation

a7cb43f

reagan-meant requested a review from ibacher August 20, 2025 12:27

ibacher reviewed Aug 20, 2025

View reviewed changes

Address comments

ac44d4f

reagan-meant requested a review from ibacher August 21, 2025 12:37

ibacher reviewed Aug 21, 2025

View reviewed changes

Add unit tests

38315c5

ibacher reviewed Sep 3, 2025

View reviewed changes

Update PR

1ac432f

ibacher approved these changes Sep 3, 2025

View reviewed changes

Fix failing tests

6626cb6

reagan-meant force-pushed the rt-27 branch from b72a959 to 6626cb6 Compare September 3, 2025 19:50

ibacher merged commit a266588 into path-drc:main Sep 5, 2025
1 check passed

		AND DATE(o.obs_datetime) >= :onOrAfter
		AND DATE(o.obs_datetime) <= :onOrBefore

	// Lessthan 3 months ART Dispensation
	// Less than 3 months ART Dispensation

Conversation

reagan-meant commented Aug 12, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ibacher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ibacher commented Aug 21, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ibacher commented Sep 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants